fix: properly merge envs in configmap and container. Fixes #12424 #12426
+92
−2
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.